Unify math.h includes and conditional M_PI definition since we kept getting

it wrong...

diff --git a/gpsbabel/copilot.c b/gpsbabel/copilot.c
index 5bba68a986e286a86dcd70595e008f213430765c..8ceee66d1c8c6288ef3c38118a3862dc1bcbdd1c 100644 (file)
--- a/gpsbabel/copilot.c
+++ b/gpsbabel/copilot.c
@@ -22,10 +22,6 @@
 #include "defs.h"
 #include "coldsync/palm.h"
 #include "coldsync/pdb.h"
-#include "math.h"
-#ifndef M_PI
-#define M_PI 3.14159265358979323846 
-#endif
 
 static double conv = 180.0 / M_PI;
 

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index 22161ed78183410b358cbae8740b870520cd4d53..b838212af7b7b1d8d135c93373e473e2e73f2897 100644 (file)
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -25,6 +25,14 @@
 #include <stdarg.h>
 #include "queue.h"
 
+
+/*
+ * Amazingly, this constant is not specified in the standard...
+ */
+#ifndef M_PI
+#  define M_PI 3.14159265358979323846
+#endif
+
 /*
  * Common definitions.   There should be no protocol or file-specific
  * data in this file.

diff --git a/gpsbabel/grtcirc.c b/gpsbabel/grtcirc.c
index 0106e121694adb21c5a4714e5ae62c7bac3f1cf4..d059e3c84a5eea5bb32eeb321dd9ecd23106b8af 100644 (file)
--- a/gpsbabel/grtcirc.c
+++ b/gpsbabel/grtcirc.c
@@ -19,13 +19,8 @@
 
  */
 #include <stdio.h>
-#include <math.h>
 #include "defs.h"
 
-#ifndef M_PI
-#  define M_PI 3.14159265358979323846
-#endif
-
 static void crossproduct( double x1, double y1, double z1, 
                   double x2, double y2, double z2,
                   double *xa, double *ya, double *za ) {

diff --git a/gpsbabel/polygon.c b/gpsbabel/polygon.c
index d68e92d068544a283b490ebb957c15e8d3f42474..2cc00b020abe4cf1d96ad7e7c61c24d19e59e85e 100644 (file)
--- a/gpsbabel/polygon.c
+++ b/gpsbabel/polygon.c
@@ -18,14 +18,8 @@
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA
 
  */
-#include <stdio.h>
-#include <math.h>
 #include "defs.h"
 
-#ifndef M_PI
-#  define M_PI 3.14159265358979323846
-#endif
-
 #define MYNAME "Polygon filter"
 
 extern queue waypt_head;

diff --git a/gpsbabel/position.c b/gpsbabel/position.c
index a1f016a80a829a83e971bdca928ed60a1c2e205e..f1100bcfa3f0ef55dd6d868c99183b0444ed938c 100644 (file)
--- a/gpsbabel/position.c
+++ b/gpsbabel/position.c
@@ -18,8 +18,6 @@
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA
 
  */
-#include <stdio.h>
-#include <math.h>
 #include "defs.h"
 #include "grtcirc.h"
 

diff --git a/gpsbabel/psp.c b/gpsbabel/psp.c
index 20737ef34f43c3dbe19c8661b43972ac32dc4207..4aacd5cd9e8a1bdcb006060736c24df0707818e0 100644 (file)
--- a/gpsbabel/psp.c
+++ b/gpsbabel/psp.c
@@ -22,7 +22,6 @@
 
 #include "defs.h"
 #include <ctype.h>
-#include <math.h>  /* for M_PI */
 
 #ifndef M_PI
 #  define M_PI 3.14159265358979323846